merge from trunk
authorJoakim <joakim@localhost.localdomain>
Tue, 17 Aug 2010 21:19:11 +0000 (23:19 +0200)
committerJoakim <joakim@localhost.localdomain>
Tue, 17 Aug 2010 21:19:11 +0000 (23:19 +0200)
commite79affee02f55fe78382828b7855502ebf581dc3
treef98e06e381d80bcce61bdc2b01e81c9b8cc4e0f1
parent14f909a37b5304d1472789060f62955e1570967a
parent9391facd67f4b1b21c2e9b375afbdc2d7c580421
merge from trunk
configure
configure.in
lisp/image-mode.el
src/Makefile.in
src/config.in
src/image.c